Merge branch 'master' of git://git.denx.de/u-boot-sh
authorTom Rini <[email protected]>
Thu, 1 Mar 2018 20:50:43 +0000 (15:50 -0500)
committerTom Rini <[email protected]>
Thu, 1 Mar 2018 20:50:43 +0000 (15:50 -0500)

Trivial merge